Adwaita: fix treeview spinbutton style

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 53be3001ab79a56480098a41f937989c1b7f3d2d..3b5692a0f42e89b372836503e69293520a6fc320 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1171,14 +1171,14 @@ spinbutton {
   }
 
   // Misc
-  treeview & {
-    entry,
-    entry:focus {
-      padding: 1px;
-      border-width: 1px 0;
-      border-color: $selected_bg_color;
-      border-radius: 0;
-      box-shadow: none;
+  treeview &:not(.vertical) {
+    min-height: 0;
+    border-style: none;
+    border-radius: 0;
+
+    entry {
+      min-height: 0;
+      padding: 1px 2px;
     }
   }
 }

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 28544b752aaf44530fdd07f8de435a1490c65913..c6d2c6386c79c1d0832d5dab541780b08289b81e 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1412,13 +1412,13 @@ spinbutton.vertical button.down {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
-treeview spinbutton entry,
-treeview spinbutton entry:focus {
-  padding: 1px;
-  border-width: 1px 0;
-  border-color: #215d9c;
-  border-radius: 0;
-  box-shadow: none; }
+treeview spinbutton:not(.vertical) {
+  min-height: 0;
+  border-style: none;
+  border-radius: 0; }
+  treeview spinbutton:not(.vertical) entry {
+    min-height: 0;
+    padding: 1px 2px; }
 
 /**************
  * ComboBoxes *

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 85de7b97f8b01e696f7b3e11943e3fc3b0643d90..5a40f3955847b70e32f52d74301bbe9ddbd26c56 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1418,13 +1418,13 @@ spinbutton.vertical button.down {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
-treeview spinbutton entry,
-treeview spinbutton entry:focus {
-  padding: 1px;
-  border-width: 1px 0;
-  border-color: #4a90d9;
-  border-radius: 0;
-  box-shadow: none; }
+treeview spinbutton:not(.vertical) {
+  min-height: 0;
+  border-style: none;
+  border-radius: 0; }
+  treeview spinbutton:not(.vertical) entry {
+    min-height: 0;
+    padding: 1px 2px; }
 
 /**************
  * ComboBoxes *